Pull XEN_LINUX_UPDATE into mk.linux-2.6-xen so it can be shared by

src.tarball and src.hg-clone

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 4fd195b39797714bb7096a2672fb620c4db5c280..8abccd389479233c83fd073bf380429db73b2e0a 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -7,6 +7,16 @@ EXTRAVERSION ?= -xen
 # repositories.
 LINUX_SRC_PATH ?= .:..
 
+# The source directory is not automatically updated to avoid blowing
+# away developer's changes. If you want to automatically pull a new
+# version of the Linux tree then add `XEN_LINUX_UPDATE=y' to your make
+# command line.
+ifeq ($(XEN_LINUX_UPDATE),y)
+__XEN_LINUX_UPDATE = $(LINUX_SRCDIR)/.force-update
+else
+__XEN_LINUX_UPDATE =
+endif
+
 XEN_LINUX_SOURCE ?= hg-clone
 
 # Let XEN_TARGET_ARCH override ARCH.
@@ -137,3 +147,7 @@ delete:
 mrproper:
        rm -rf $(LINUX_SRCDIR)
        rm -f linux-$(LINUX_VER).tar.bz2
+
+.PHONY: $(LINUX_SRCDIR)/.force-update
+$(LINUX_SRCDIR)/.force-update:
+       @ :

diff --git a/buildconfigs/src.hg-clone b/buildconfigs/src.hg-clone
index e1d7913c61f4f594bbef0af12cf28d0c60394210..fa7f247e7eabb46ac5d9e9841dacd8c115061f63 100644 (file)
--- a/buildconfigs/src.hg-clone
+++ b/buildconfigs/src.hg-clone
@@ -6,16 +6,6 @@ LINUX_SRCDIR ?= linux-$(LINUX_VER)-xen.hg
 # Repository to clone.
 XEN_LINUX_HGREPO ?= $$(sh buildconfigs/select-repository $(LINUX_SRCDIR) $(LINUX_SRC_PATH))
 
-# The source directory is not automatically updated to avoid blowing
-# away developer's changes. If you want to automatically pull a new
-# version of the Linux tree then add `XEN_LINUX_UPDATE=y' to your make
-# command line.
-ifeq ($(XEN_LINUX_UPDATE),y)
-__XEN_LINUX_UPDATE = $(LINUX_SRCDIR)/.force-update
-else
-__XEN_LINUX_UPDATE =
-endif
-
 # Set XEN_LINUX_HGREV to update to a particlar revision.
 XEN_LINUX_HGREV  ?= tip
 
@@ -40,7 +30,3 @@ $(LINUX_SRCDIR)/.valid-src: $(__XEN_LINUX_UPDATE)
            ( cd $(LINUX_SRCDIR) && $(HG) update $(XEN_LINUX_HGREV) ); \
        fi
        touch $@
-
-.PHONY: $(LINUX_SRCDIR)/.force-update
-$(LINUX_SRCDIR)/.force-update:
-       @ :

diff --git a/buildconfigs/src.tarball b/buildconfigs/src.tarball
index 1a52c39410c65a5bd7782fd617db07952590f46f..176e6cc4f703a8795876c98f7b0500df6ea27469 100644 (file)
--- a/buildconfigs/src.tarball
+++ b/buildconfigs/src.tarball
@@ -18,11 +18,11 @@ linux-%.tar.bz2:
 # XXX create a pristine tree for diff -Nurp convenience
 
 ifeq ($(XEN_LINUX_TARBALL_KETCHUP),y)
-%/.valid-src:
+%/.valid-src: $(__XEN_LINUX_UPDATE)
        $(KETCHUP) -d $(@D) $(LINUX_VER)
        touch $@ # update timestamp to avoid rebuild
 else
-%/.valid-src: %.tar.bz2
+%/.valid-src: $(__XEN_LINUX_UPDATE) %.tar.bz2
        rm -rf tmp-linux-$* $(@D)
        mkdir -p tmp-linux-$*
        tar -C tmp-linux-$* -jxf $<